From 2f6e6f2eede861cac2c0e906d3ee57c2e9d5ef0b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 9 Jul 2007 18:00:22 +0000 Subject: [PATCH] Fix build problems on Cygwin. (#448604) 2007-07-09 Matthias Clasen * modules/printbackends/*/Makefile.am: Fix build problems on Cygwin. (#448604) svn path=/trunk/; revision=18412 --- ChangeLog | 5 +++++ modules/printbackends/cups/Makefile.am | 7 ++++--- modules/printbackends/file/Makefile.am | 3 ++- modules/printbackends/lpr/Makefile.am | 2 +- modules/printbackends/test/Makefile.am | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6278bb8247..5dca5df405 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-07-09 Matthias Clasen + + * modules/printbackends/*/Makefile.am: Fix build problems + on Cygwin. (#448604) + 2007-07-09 Jaap Haitsma * gtk/gtkstatusicon.c: Remove usage of deprecated GtkTooltips API. Use diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am index e768c5bd47..9b179a1e0b 100644 --- a/modules/printbackends/cups/Makefile.am +++ b/modules/printbackends/cups/Makefile.am @@ -1,4 +1,4 @@ -if OS_WIN32 +if PLATFORM_WIN32 no_undefined = -no-undefined endif @@ -14,8 +14,9 @@ INCLUDES = \ $(GTK_DEBUG_FLAGS) LDADDS = \ - $(GTK_DEP_LIBS) \ - $(top_builddir)/gtk/$(gtktargetlib) + $(top_builddir)/gtk/$(gtktargetlib) \ + $(top_builddir)/gdk/$(gdktargetlib) \ + $(GTK_DEP_LIBS) backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends diff --git a/modules/printbackends/file/Makefile.am b/modules/printbackends/file/Makefile.am index b74bdc369f..1afee74ca4 100644 --- a/modules/printbackends/file/Makefile.am +++ b/modules/printbackends/file/Makefile.am @@ -1,4 +1,4 @@ -if OS_WIN32 +if PLATFORM_WIN32 no_undefined = -no-undefined endif @@ -27,6 +27,7 @@ libprintbackend_file_la_LDFLAGS = \ libprintbackend_file_la_LIBADD = \ $(top_builddir)/gtk/$(gtktargetlib) \ + $(top_builddir)/gdk/$(gdktargetlib) \ $(GTK_DEP_LIBS) noinst_HEADERS = \ diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am index 305399c20f..a207e01fdb 100644 --- a/modules/printbackends/lpr/Makefile.am +++ b/modules/printbackends/lpr/Makefile.am @@ -1,4 +1,4 @@ -if OS_WIN32 +if PLATFORM_WIN32 no_undefined = -no-undefined endif diff --git a/modules/printbackends/test/Makefile.am b/modules/printbackends/test/Makefile.am index cbbfd60348..e023dc8186 100644 --- a/modules/printbackends/test/Makefile.am +++ b/modules/printbackends/test/Makefile.am @@ -1,4 +1,4 @@ -if OS_WIN32 +if PLATFORM_WIN32 no_undefined = -no-undefined endif -- 2.30.2